[automerger skipped] Merge changes I33b70b0a,I1074eedb am: e286c5e1 am: cbcb46cb -s ours am: 26187e2f -s ours

am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae6761 is in history

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

Change-Id: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b