Merge changes Ie5a1d85f,I0aa9acfb,I19f0abe3,I0877e2d7 am: b58311f3b6

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

Change-Id: Ied87b898983e1fc3faf1de66a29660b4652d34be