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 am: 5d95b855

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



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