Merge changes from topic "presubmit-am-2c53fb43bdab4e97b09f15ae0a56fa78" into tm-dev am: f842441faf

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

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