Merge changes from topic "presubmit-am-63cee7df41274a07a7523570348ebb84" into sc-mainline-prod am: f67189e7

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

Change-Id: I5a90db32c2b72a8c0383d3c086db543401bcd631