Merge "Fix feature flag check for FEATURE_COMPANION_DEVICE_SETUP" into tm-qpr-dev am: a63b02aa

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



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