Merge changes I1d3e5e66,I86b869af,Iab4d3902,I645ee722 am: 72864d2930 am: 968582e45f am: cb2ebfc692

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

Change-Id: I3a0abc3172b06e201535876bf01d37ed357853af