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

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



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