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

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

Change-Id: I59f834071b66d310652016a626b0f8a6bb471d03