Merge changes If2201f39,Ia1c366c5 am: 6ec2a15480

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

Change-Id: I6ad54ba833d242ed790123c381a308ef678e4d4d