Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 892589c514

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

Change-Id: I74e0c3eae3bf22c9a05968e2daf5b59da33f01bb