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

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

Change-Id: I426ed285d9c1db8a9240b53912831d64c43a7503