Merge changes I5ee56ddd,Ib9ef2a7b am: 3789826e68 am: 4973cc90d9

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

Change-Id: I209f5a3899e50a4bf69a1eebe1ac62e00ccb9f02