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

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

Change-Id: If308dfd729bdc2992bda4946340b6dcc6061fcd0