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

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

Change-Id: Ia2779a68a17225190222b56358d6ca13a97ea00a