Merge changes If5292d1d,Ib1a86d48 am: d4b099d3fa am: 6c8990d3a8 am: 6ebfa24970

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

Change-Id: Ief0e227f09c379c2f2cd8014bb368ceca0e5e34f