Merge "[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: 908e5fc2a4 -s ours
am: 85d6456455 -s ours
am skip reason: subject contains skip directive

Change-Id: I5ec1859a23cf60b4267df739034d2e039edf8cec