Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6 am:...

Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6 am: 61d8dee2 am: 41e0e6fe am: 984e74a3

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



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