Merge "Merge "Add null checks to browser callbacks" into rvc-dev am:...

Merge "Merge "Add null checks to browser callbacks" into rvc-dev am: 31a89937 am: 80333767 am: f1381e3f" into rvc-qpr-dev-plus-aosp am: 8e3e2a49

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

Change-Id: I907a11e456c15ed676c62297c4e048554eb08a2a