Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: b088f96ef5 am: a83081d783 am: 25ec3fb792
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19886859 Change-Id: I6945996d2535e0158df3b49468a45af59593038a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: