Merge changes from topic "presubmit-am-2fdbe572af844efa80b9758765138692" into tm-mainline-prod am: 7edf690b

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

Change-Id: I407404435222fc90a01645d2f59c0a77c5c584be