Merge changes Ib048c18b,Ie7694a63 am: 2963649fe4

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

Change-Id: Id4ea90fbd8c9ec3cb5839523824a5cc3319148ba