Merge ""Steal" single value variables in rbc inheritance" into main am: 0c2ef754 am: fc7bd470

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



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