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

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

Change-Id: Ia6b0f0a98764917afe1e5e341262ca223109402d