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: Iafc4c8d40612bdc66b148f778e5faf1b1d087bb3