Merge "Update hiddenapi preupload checks to handle new location" am: ca0501d1b8

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

Change-Id: I4e59d25472977f5ddfc49f5231cff1a35e86013d