Merge "Fix presubmit for hidden api." am: cde72c6791

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

Change-Id: Ica1d13d418b5ea0712024faade7546903a59a217