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

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

Change-Id: I0d5479c8b6e7f20dbd430d119c0a33b121222e1a