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

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

Change-Id: Ia268e0c9f0a2686a598bc38a6b2a48bc75e96290