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

Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into tm-dev am: f842441f am: ede0eeb3 am: ddcf57c8

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



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