Merge changes I53ca4b98,I1757fdeb am: 3a463815e2 am: 230fabb17e am: 1569c71b07 am: 3616f6eced am: 3cae8eec79

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

Change-Id: I6960604ea5fe5958906d9f62d0c5816d222a5b25