Merge changes Ie238e8e5,I113e33a7 am: 5dbc2cd15d am: e349439f69 am: ea6304aa95 am: 95b3fe3a3e

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

Change-Id: Ife87ef484729cf48b8a88556028573d8103c5bf7