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

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

Change-Id: Iaa561429882703c11300636bd78e0a3b1b568ded