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

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

Change-Id: Iba8403239b771796acdd1fad5fd0dad0d735a182