Merge changes from topic "presubmit-am-b2dcf94a336a41e18a9370da4e132cfa" into sc-mainline-prod am: c83fd65cfe

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

Change-Id: Ie36db2a2dd7cc3b161228a35f2d2c96fb8405f03