[automerger skipped] Merge "Add null check to work around async unregistration of receiver" into sc-dev am: 72922c8a85 am: 697483e16f -s ours
am skip reason: Merged-In I47272513482c2ed31167574d2f2cab6094cfd590 with SHA-1 ac42fd0bf9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15316986
Change-Id: Ia8294dbd614481f9c5a24cd76dc9cda07fc7ea93
This commit is contained in: