Merge changes from topic "apex-allowed-deps" am: a6d18b6830

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

Change-Id: I6f88cd44305d5d069babe7a629d66e82b0f31a87