[automerger skipped] Merge "Fix feature flag check for FEATURE_COMPANION_DEVICE_SETUP" into tm-qpr-dev am: a63b02aa16 am: 0845453dcc -s ours
am skip reason: Merged-In I556089e2b024eaf87937e57e8825ae0e7c61e02c with SHA-1 fd755df5c4 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>
This commit is contained in: