[automerger skipped] RESTRICT AUTOMERGE am: 79062d7903 -s ours am: 6f14b9586d -s ours am: 6f46168580

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

Change-Id: I2f70153f26fc5647a14702b733c59794b3d1ee65