[automerger skipped] Merge the framework-defaults into framework-minus-apex...

[automerger skipped] Merge the framework-defaults into framework-minus-apex am: 3e206723 am: f5b867d3 am: c3d5dd41 am: 774d4102 -s ours

am skip reason: Change-Id Ia06b50195dcf7de076664af4592616be5264ae21 with SHA-1 5954c6d5 is in history

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

Change-Id: Ie3a5f60dcaeed2c35bfbbacbfaa843859a6cdfc8