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

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

Change-Id: Id6dcbd7bc37d3da22e9fe6af1d82e9d2aaf32e1b