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

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

Change-Id: Ie76ad514683d6174ab256f7421fc07ae5cacff07