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

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

Change-Id: I158327aac40b17d516c7a721dadd788e85ae63d9