Merge changes I0faeda20,I726e74f5 am: 4cea2d3830 am: 363fe9d0b5

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

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0