Merge "Remove hwcomposer manifest snippet to avoid conflict" am: 126f0eca1f am: b57327f75f

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

Change-Id: I80caaebf00e418822ff518a8f93db5432bed829c