Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d am: ec1f981309 am: 5013902a24

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

Change-Id: I8bff7924842316486f5058b241ee728fc74d0c4b