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

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

Change-Id: Iea5ba64fd780aa1da32b129a0fd1b758631fe3a1