Merge changes from topic "presubmit-am-e92afcd55f3d48528cb418d19ac598f7" into...

Merge changes from topic "presubmit-am-e92afcd55f3d48528cb418d19ac598f7" into tm-mainline-prod am: b77d9807

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

Change-Id: I37fb2a1ee23057c9e0ef5d8ceeb7e9d6f27bc7d1