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