Merge changes Ife0b17c2,If37e5c6c am: d4baac7702 am: b0e98333fe am: 06292bb0e6

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

Change-Id: Id271518469c22d729ee446e8a8226faa03cb2043