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

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

Change-Id: I047a95bbf6d70f1a03e35782a36a98f34f51ca9c