Merge changes Ia8944415,I60d845ac,Ia9d34911 am: ab6c9f3239 am: e037b23f18 am: 3c44761c8e am: 613b75e804

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

Change-Id: I1d37e3d9c0a6baf237988c11b910665648af55ff