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

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



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