[automerger skipped] Merge changes If69f69bf,I941b3c89 am: b3bd77fc am: a4060c02 am: ee9897eb am: 5fe3cd60 am: a675fc6b -s ours

am skip reason: Change-Id If69f69bf7861ba3569756270381f3f737366f2f0 with SHA-1 56af5939 is in history

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

Change-Id: I0dc90a8599111a4c6e2f30197bd8acaecba1cff0