[automerger skipped] Merge "Enforfce a minimum padding to ensure space for the...

[automerger skipped] Merge "Enforfce a minimum padding to ensure space for the privacy dot" into sc-dev am: 995fce70 am: b6b8682f am: 9e59c936 -s ours

am skip reason: Merged-In I3b28dd78f909321a54a3e196b67011d3165cbbd3 with SHA-1 4b1b5a68 is already in history

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

Change-Id: I805d82c13e801683a96b38482a34afd5240037c4