Merge changes Ic4afb996,I9792e14a am: b4b43a5209 am: ed19a49dbf am: 1cbff04130 am: 6b71638c93

Original change: https://android-review.googlesource.com/c/platform/development/+/1977839

Change-Id: I6616ca27c7d176a1320562c96120380980034c39