Merge "Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486dce am: 51e68e2a08 am: f8060c150b" into sc-v2-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2021-08-16 22:21:46 +00:00
committed by Android (Google) Code Review

Diff Content Not Available