Merge "Add null check to work around async unregistration of receiver" into sc-v2-dev am: f9a8735e5b

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

Change-Id: I22471dfbdf57edc583ae56fe7a4f88d9748dc0e3