[automerger skipped] Merge "Fix feature flag check for...

[automerger skipped] Merge "Fix feature flag check for FEATURE_COMPANION_DEVICE_SETUP" into tm-qpr-dev am: a63b02aa am: 0845453d -s ours

am skip reason: Merged-In I556089e2b024eaf87937e57e8825ae0e7c61e02c with SHA-1 fd755df5 is already in history

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



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