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

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

Change-Id: I21b1896f6be97725179c9edb6c70484f937b02a0