Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am: 5c25605da0 am: 8d53c79a02

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

Change-Id: I2fed3e587f6d93ee9e68b01235e84dd725e4d4bb