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

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

Change-Id: I96c559ffb24d874a823b0866822c8851009664ea