Merge changes I414dce58,I165716a0,I101d8949 am: 02fe346e84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fcbb5278fd223a951349ffefb49d366c683d827