Merge "[Settings] Expand the display area of PIN error message" am: 7f348f2ba9 am: d692413d83 am: 59e07d18f3 am: 703e5395b4

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928382

Change-Id: I2fff5b5c56d219a171dfadcfbdf9b0f6c579f690