[automerger skipped] Merge changes from topic "presubmit-am-289267195037481da3696382edaa3c15" into sc-dev am: cd4ec6ac -s ours am: 999a6426 -s ours

am skip reason: Merged-In Ic44d662936d1ff0cae7fbe915932b37aa4e4869a with SHA-1 784edef8 is already in history

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

Change-Id: Ib8bcc3872e711283a44221be09c6050f206f2969