Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296 am:...

Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296 am: 44b2f6ce am: 272bf955 am: b5a78c6a

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

Change-Id: I88307dc9610c71bf1966269a7d5c8c7dd2f9626f