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

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

Change-Id: I22a75b31abf5f0adfe2835f9da66344aa73a3a22