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

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

Change-Id: Ifde8b21834c3dac0cba363a667f7d94e820e18a2