Merge changes I6d3584f3,Ifdaada39 am: f637a0d63d am: 32060ccf62 am: a9d6cd1c13 am: 081bbce10f

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

Change-Id: I6a47e5f0ccc4f8157377822619d9307b6a270f8e