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

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

Change-Id: Iaba4bff0265654c729bbd32d15294b65b3915d24