Merge "Handle JavaBBinderHolder not init w/ mockito" am: 9590eb18 am: b5d7885b am: dadc4f23

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



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