Merge "Fix NPE" into tm-dev am: 2b38dbd41b am: 22d21f296a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886853 Change-Id: I5124508b58632ca9e98f5c3de6bceb793f9ba118 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: