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