Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am: b82853357b am: 89aedd6cb8 am: af77c134d9

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

Change-Id: I35b678f40dbc8643224aec26ba1808da893bb80f