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

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

Change-Id: Ie1e6546b22174f680af8996cf98057251d6ab690