[automerger skipped] Merge changes Ife0b17c2,If37e5c6c am: d4baac77 am: b0e98333 am: 06292bb0 am: e86fba67 -s ours

am skip reason: Change-Id Ife0b17c281984fc489ef46039cbf5aa7b1346bdb with SHA-1 01b8e6df is in history

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

Change-Id: I0fb6aa41c53508e883bea85e38badab8d8037ef1