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:
committed by
Android (Google) Code Review
commit
a72bd108e5