Merge changes If2201f39,Ia1c366c5 am: 6ec2a15480 am: d650ae9f8e am: d4e61ada27

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

Change-Id: Ic2857aae38dfa7ccf9996689e198f9e175045462