Merge changes I3242ad0e,I5daced20,Iefd284ae am: f1d78f17c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc653e7fbd0969eede95a194e2a47cd7c7d79dad