Merge changes Ife0b17c2,If37e5c6c am: d4baac7702

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

Change-Id: Id30adbb17a0d96d7dd144c615bc6af4eef36bf07