Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 58a2186be0 am: 6ff1005d16

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I003a453f17b37f10e2acd4c92aa56fe52c09741f