Handle Android.bp files in subdirectories of androidx am: ec263277 am: 97633e43 am: 5a39617a

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



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