Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into...

Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into tm-dev am: f842441f am: 9f64d6fa am: 9d0c0f76

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



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