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

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

Change-Id: Ib439f540397986135192962d771c3f753a7f759c