Merge changes from topic "presubmit-am-9bf045867a3b4fa6bf8fd8e1397b852e" into tm-mainline-prod am: 316c9170

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

Change-Id: I87d6dff074520f1e3579aca57409f6e3566d2eea