[automerger skipped] Merge "[RESTRICT AUTOMERGE] Backport aosp/880799 and aosp/871129 from master to pie-cts-dev" into pie-cts-dev am: a6e1a88643 -s ours
am: 097adb8f77

Change-Id: I01d2508afa0a8d1e337662f930d3fff760a5228b