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

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

Change-Id: Ide383ab76488b6d60f9349bfa9efd5264cea167c