[automerger skipped] Merge "[Home Controls] Update home controls file usage."...

[automerger skipped] Merge "[Home Controls] Update home controls file usage." into tm-qpr-dev am: ec7cf25c am: 43e2ebd3 -s ours

am skip reason: Merged-In I9d84850acd4c3b781e8b3325d9fd228bc98d4c12 with SHA-1 e4c256d9 is already in history

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



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