Merge "Increasing size of lock icon on big screen devices" into sc-v2-dev am: d13c46ae87 am: 47c89100fb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16388998

Change-Id: I8b1b9518e59318d45398861e4a2556c0de513666