Merge changes Ib80f814f,Ic605e489 am: ae7491e2f9 am: 46bafc65ab am: 7b190776ba

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f