Merge changes I54c2258c,I47b2d3ac am: 53de4cb310 am: d0dcf4d412 am: e447b40de4

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

Change-Id: I579f5805c98d3d6497b016bdbdb5a7ef76fce7f0