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

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

Change-Id: I746483a5b23f1c64e8670c430fef105599437a5d