[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 403b7fd0 to stage-aosp-master am: fdc5eb6e am: efd2d89d -s ours am: 45b473c0 -s ours

am skip reason: skip tag Change-Id Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3 with SHA-1 00617edb is already in history

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

Change-Id: I3a698677ed54153ec1a685e5d1783fdabbefda31