Merge changes Ib1a1d1bb,If0362c6d,I6018791a,Id81c93ea,I7704a884, ... am: 7e226700a5 am: 58d04c0fec am: 139eb8fe39

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

Change-Id: Idb36d66032a69b877d1d961cb19c7ff1333e6624