Merge "Fix NPE" into rvc-dev am: 880c4ce9e3 am: d135ca54f1 am: 113ffcec2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11710011 Change-Id: Ieab32d1526ac3950badef170463563ac6b20eac7
This commit is contained in: