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

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



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