Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in...

Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477



Change-Id: I3b6bd741adafcb423b9e2398b5a2c7fd00a0bedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>