Merge changes Ie238e8e5,I113e33a7 am: 5dbc2cd15d

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

Change-Id: Ic38d22e1a8ec41fb611e8dc01f500d804730770a