Merge "Generalize tools/hiddenapi/checksorted_sha.sh" am: a48ee296ee am: 44b2f6cebd

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

Change-Id: If39e9d7f60ea28fe81ab05763d43337f7f5d7dc9