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

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



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