Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 71996469d2 am: 068f44831d

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

Change-Id: Ia0b6ffa74536e3f20f13282d08bd858fc9e979bf