[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make a context dervied from...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make a context dervied from an UI context as an UI context" into rvc-qpr-dev am: b699ff31 am: 155680e8 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12432005

Change-Id: Iabdf4c1927a1955371fc28977e06fdeadbb2b431