Merge "Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am:...

Merge "Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am: 5c25605d am: 8d53c79a" into rvc-d1-dev-plus-aosp am: ec3cdeba

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

Change-Id: I922025c29fe52ce81ee929c689026132dadbe804