Merge changes I5719ba0f,I5f3106b7,I3fd90c2d am: fd7056c7c9 am: 7f06596361

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

Change-Id: I5545e8cf6acdf135cdae390329c548be82190812