Merge changes Ib7d51cf1,I92bd2831 am: 179826efdc am: 934206376c am: 1cf64f23de am: 00429ea809

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

Change-Id: If73744bfb0bb0b2c11a7fa859f7057e69fd36805