Merge changes I93fa880a,Ib036852a,Ic5ab3c04,I4452eacf am: 20909a93b0 am: 1d4cea45d6

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

Change-Id: Ic68afbf39ea2ec8a00fca543676f415debe351b9