Merge changes I5801bcc3,Ib2290546 am: 1584123dbb am: 9bca36aeee am: 235a534f1b

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

Change-Id: I88595702a3dbba37e1b2f861c63bbae34aeb61b7