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

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

Change-Id: I31c50cca2a51c243a1bc745925b518554f5e9856