Merge "Update hiddenapi preupload checks to handle new location" am: ca0501d1b8 am: 0c71f7c0a4 am: 48c3dadc6a

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

Change-Id: I5f2682d437286c1d320475c5381693c96f4db667