Merge changes from topic "presubmit-am-ef6979eb0d794319a4c16a36a338836c" into sc-mainline-prod am: 9779dd24

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

Change-Id: Iba3333e7179f5ae374c0dcb83c2d1d4d152985ad