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

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

Change-Id: I216fd60b98fefd79f54d4090d039943b1205f206