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

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

Change-Id: I4432d589a73377cb97b0e9779439e226357640c3