Merge "Add repository for controls related settings" into tm-qpr-dev am: dc5ae0129f am: 91f41ce6a9

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

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