Merge changes from topic "clamp-alpha" into tm-qpr-dev am: 04a03845

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



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