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

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

Change-Id: I44989e1ccddb235d63f9744cd604fbc86de0791c