Merge "Implement "More privacy settings"" into tm-dev am: e26d2187 am: f6605348

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



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