Merge changes from topics "presubmit-am-54728ad3f0014d59be7b146d10223f7f",...

Merge changes from topics "presubmit-am-54728ad3f0014d59be7b146d10223f7f", "presubmit-am-effdf607213e46929e9d2fba03a41994" into tm-dev am: c626cebf

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



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