[automerger skipped] Merge changes from topic "clamp-alpha" into tm-qpr-dev...

[automerger skipped] Merge changes from topic "clamp-alpha" into tm-qpr-dev am: 04a03845 am: b644ac69 -s ours am: a91d1641 -s ours am: 2eae7274 -s ours

am skip reason: Merged-In I1318f21c21ec9b3fe9577ac3b9f32605e7f7f13a with SHA-1 24d0b2a1 is already in history

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



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