Merge changes from topic "presubmit-am-c42945565164424eb2608e3ad1886691" into tm-mainline-prod am: 6642c914

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

Change-Id: I615821929a8e49cee348d381b03413b7cf848d01