Merge "[automerger skipped] Merge "Add null check to work around async...

Merge "[automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a am: 697483e1 -s ours" into sc-v2-dev-plus-aosp am: cd9035dd -s ours

am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 f9fdfa97 is already in history

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

Change-Id: Ie59bae563167602f5d2458c518f4d9af6be878a9