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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03b020217da7bbf229195c4af55172d5de6ddc5f