Merge changes Ib048c18b,Ie7694a63 am: 2963649fe4 am: 76ba518dcc am: ac2fa4550a am: 3d0da2164e

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

Change-Id: I100b99df2cb67a7bf85c3d494234bf4f723524d3