Merge changes I64b56575,I40553a7b am: 80afe1eeee am: f595e45401

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

Change-Id: I9aa38eeb37dd3b34145363a1a5dda3944eecfb72