[automerger skipped] Merge changes I111361f7,Ic4979b91,Ic289d772 into...

[automerger skipped] Merge changes I111361f7,Ic4979b91,Ic289d772 into tm-qpr-dev am: 7fa3483d am: f30d3c1f -s ours

am skip reason: Merged-In I111361f7470fdad39b493b516e8a8f167e0c681c with SHA-1 c0bdeefd is already in history

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



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