Merge "Take home controls setting into account" into tm-qpr-dev am: bca7840e am: 5937fbbe

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



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