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