Merge "Enforfce a minimum padding to ensure space for the privacy dot" into sc-dev am: 995fce70

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

Change-Id: Ia78ec86fc51927c5c29022703712343c5d00b67c