Merge "Add communal settings category key." into tm-qpr-dev am: 8118ea49 am: ac7f50eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20737688



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