Merge changes Icf32cb46,I43434c80,I59dc46dc,I7df3f14b,I50f2c0e9 am: e253ce3463

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

Change-Id: I8c601a01330d15509b5572eac958ffb22de58698