Merge "[automerger skipped] Merge "Fix test 674-hiddenapi when debuggable." into pi-dev am: 5043a9a03e  -s ours" into pi-dev-plus-aosp