Merge changes from topic "home-controls-type" into tm-qpr-dev am: 111c26fe am: ffdd2191

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



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