Merge "Add null checks to browser callbacks" into rvc-dev am: 31a8993720 am: ca5bcc9767

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

Change-Id: I2fc92feed42cf58f0a1cd6197aca63c50a2728fd