Merge "Add an explicitly v4 manifest fragment" into main am: 8883c4f463 am: 4311a3ef41

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

Change-Id: I6eace4a5f58ef398cd06680ad9a3a38dd3e89de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>