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

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

Change-Id: I8f61808337fc79713c1cc6406c271639f3306d09