Merge changes I5801bcc3,Ib2290546 am: 1584123dbb

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

Change-Id: Iead19c226245fe700bed72a07241a18c8a3f41d4