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: ca5bcc97" into rvc-d1-dev-plus-aosp am: 6fa8d2f1

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

Change-Id: I5f3fea4ca0b164dd505d48dac0230b190d23581a