Merge changes I3242ad0e,I5daced20,Iefd284ae am: f1d78f17c2 am: 3371693fda am: 0fd3dfe01b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd62dea9ccaaa967fef6c1cc06483e3d3cabbc1b