Merge "Handle Android.bp files in subdirectories of androidx am: ec263277...

Merge "Handle Android.bp files in subdirectories of androidx am: ec263277 am: f80899cd" into udc-qpr-dev-plus-aosp am: 417c474e

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



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