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

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

Change-Id: Ib3c4202f8b84d7bce390d72bfde2e4e518c6b2a0