Merge "[Home Controls] Update home controls file usage." into tm-qpr-dev am: ec7cf25cc4

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

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