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

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

Change-Id: I635670dd84a4dd9db0d0936a6a5bd31435d74533