Merge "Checking for null proxy object before operating on a method of the...

Merge "Checking for null proxy object before operating on a method of the proxy object" into tm-qpr-dev am: 5a29df1b am: 271121fd

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



Change-Id: I52b6e4edfc1be93cda1d8631edd7362e9a69b4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>