[automerger skipped] Merge "SF: Refactor HWComposer::onHotplug()" into rvc-dev...
[automerger skipped] Merge "SF: Refactor HWComposer::onHotplug()" into rvc-dev am: cf0d051a am: bf885e08 -s ours
am skip reason: Change-Id Ib4dae2ce81e8cac176a56b6de787a4f76d01c050 with SHA-1 bdd5915f is in history
Change-Id: I157eeac8e837f8ff7ca54c26f99dba433203e941