Merge changes I414dce58,I165716a0,I101d8949 am: 02fe346e84 am: 890114ac08

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50e6823a87f02341cd9886d1817e10006c16346a