Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de am: aa84ebeaab

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

Change-Id: I13ede496e5c4d5f86af75a687f6460e09f30acf6