[automerger skipped] Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" into sc-dev am: 1efb3858 -s ours

am skip reason: Merged-In I94e3122372dd20c942b2c858070a6ca797312792 with SHA-1 f93c13d5 is already in history

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

Change-Id: I3afeaea1c9f55dc0715fd388c34a1aadc1c1d31d