Merge changes I111361f7,Ic4979b91,Ic289d772 into tm-qpr-dev am: 7fa3483dfb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19758680

Change-Id: I09e6632b8589ad155e1d3678be39a055e148c807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>