Merge "Temporary NPE mitigation." into tm-dev am: 08009d5e02 am: f7a66523ae am: ba6f28cbd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17571865 Change-Id: Ia5dbbd3917e6a4f06d8243b5dc06f0e39dc762a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: