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

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

Change-Id: I55f18581b7980da472dbbd20f843fcc03a27ea72