Merge changes from topic "presubmit-am-62752a86f22e42429ed1b2fe80913d06" into tm-mainline-prod am: b4274b68

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



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