[automerger skipped] Merge changes from topic "yl-repeat-sc-v2-dev" into...

[automerger skipped] Merge changes from topic "yl-repeat-sc-v2-dev" into sc-v2-dev-plus-aosp am: 6693ae4f -s ours am: b9bad684 -s ours

am skip reason: Merged-In I81b7bf63b7cfd36b8765dc39c225103d4cd48587 with SHA-1 49633a3c is already in history

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

Change-Id: I0ab9786d3b817ccaf98694c1e749b0b931318e29