Merge "Improve hiddenapi exclude.sh script" am: b1becf7cfb am: 8637b71f39

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660362

Change-Id: I4937f663c0da4414a482f1589df72cb5c5191316