Merge "Refactor special handling of hidden API encoding for master-art" am: fdd9743609

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

Change-Id: Id36a114acd7854164cc3eee2c99e1144372b9f64