Merge "Fix formatting around rkp-vm tag" into main am: 26b5ae0f am: 6dfe13eb

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



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