[automerger skipped] Merge "Enforfce a minimum padding to ensure space for the privacy dot" into sc-dev am: 995fce704b am: 6ff264a077 -s ours
am skip reason: Merged-In I3b28dd78f909321a54a3e196b67011d3165cbbd3 with SHA-1 3e200953c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15163257
Change-Id: I8d5e9be1e79173fa3efb79211072a395517a7555
This commit is contained in: