Merge "Merge "Use layout parameters to determine lock icon location" into sc-dev am: d20a486d am: 51e68e2a am: f8060c15" into sc-v2-dev-plus-aosp