[automerger skipped] Merge "Fix presubmit for hidden api." am: cde72c67 am: e674eb65 am: 6b046fea -s ours am: ad064515 -s ours

am skip reason: skip tag Change-Id I39e926a348a0fb8f4040f86034affdb4204faac5 with SHA-1 e6a5253f is already in history

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

Change-Id: I8aa87860bfc6942f3702b33ec73103cfbf345c77