[automerger skipped] Merge changes I3826b9ef,I91d68ca3 am: 06c6ff8b am: 97517b84 am: 85732c98 -s ours

am skip reason: skip tag Change-Id I3826b9efc3418a724bd3753b9ad573adc3343b72 with SHA-1 46e186e8 is already in history

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

Change-Id: I81c4e3062f7546bf08f662e47cdbca63dae4d8fb