Merge changes I8c36f5af,I800bc352 am: 9acfdcf214 am: 8b93d78c01

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

Change-Id: Ie391f616d629117295fb78225d0b89f8e49fbe55