Merge changes I1f880aa6,Ie8ba8208,Ic45aa87c,I04c1263a am: e98351f355 am: 460fe6a19e

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

Change-Id: If541c5fcba1ac444d359741c5f5b12090c57003b