[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of d2455e0c to sc-v2-dev am: 5a930d1d am: e678c7af -s ours

am skip reason: Merged-In I04c2acf528c48eba17a828017de5f70424c09e51 with SHA-1 efe6ab0f is already in history

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

Change-Id: I768eeb023496a501f9405df705405c06ef0ca700