Merge changes I64b56575,I40553a7b am: 80afe1eeee

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

Change-Id: I368e03087bc78eb80defac73f19a1183121d617a