Merge changes from topic "am-3fc7639a008e458ca30ed79ae3682514" into...

Merge changes from topic "am-3fc7639a008e458ca30ed79ae3682514" into tm-qpr-dev-plus-aosp am: 9c539866 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d9e0d0ad is already in history

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



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