Merge "handle java.lang.NullPointerException" into tm-dev am: 56480c4b86 am: b3ec9ef5e5 am: acb3056ca4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17654104 Change-Id: I36f3b885e1b50694e48a677b2a27ae72979fef2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: