Merge "Fix characteristic rro for overridden packages" into main am: 1bcaa80f

Original change: https://android-review.googlesource.com/c/platform/build/+/2963463



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