Merge "Retire cbmananger from EmuHWC2" into rvc-dev am: 4eedfee636 am: 93549cff4b am: f901dd16eb

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/11230477

Change-Id: I18f2e8a20861fd5fe3fa38d7606616d32aca616e