Merge "Avoid running hasCompanionDevices on main thread" into oc-mr1-dev
am: 933108ed14

Change-Id: I244acf8ad34e1e2098c996b7e5c5549fdac4abfd