Merge changes from topic "presubmit-am-d5aeba84add64a9a9dd59331ecf1ff06" into sc-mainline-prod am: ff1f8131

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

Change-Id: I4788110e0c3412a8ac307dd2fd6ee1f09c01edcc