Merge changes I7907f0a3,Iec46c80b am: 4d233a83b7 am: 60d7707016 am: 0ca8b033dd am: 4b664e7ca0 am: ab63bbb80e

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

Change-Id: If1d1549a66ae5f593fb1267ea9b363e8ff663d99