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

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

Change-Id: I5368c548efd49ac13b3cc4794a989fe3cfc88a22