Merge changes I1d3e5e66,I86b869af,Iab4d3902,I645ee722 am: 72864d2930

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

Change-Id: I573b7ca2340c71afe3be78ab92e91f37a4266695