Merge "Fix NullPointerException in...

Merge "Fix NullPointerException in PermissionPolicyService#isTaskStartedFromLauncher" into main am: 5113e386 am: 50acc9ee

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



Change-Id: Ie3a67cef38045137b277aa690a49d61a4049d6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>