Merge "Using a manifest fragment" into sc-v2-dev am: fe342525b2 am: 8d5db93057

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16068072

Change-Id: Ic195aff1812e4ecdd5483a7fd331f6d73b08ec73