Merge "Fix privacy dialog padding" into sc-v2-dev am: f322436d6a

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

Change-Id: If5640143337442c10667dabc37609680ce6220ab