Merge changes Ife0b17c2,If37e5c6c am: d4baac7702 am: b0e98333fe

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

Change-Id: I275abdf6d24be889b6ef49a6112801129a4c081c