Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into sc-mainline-prod am: 68dd57ab

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

Change-Id: If402a1ef4625f982098b4cee45a601cc0ef34bdf