Merge "Change context assignment mechanism." into tm-dev am: 4f027ec47c am: 52aed8524e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325245 Change-Id: Ifecfc91ced6de621a822a312c603470d22791864
This commit is contained in: