am 9dad7d44: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP.
* commit '9dad7d44d29d27afa802922abc52bfaddb4e83a0': DO NOT MERGE: Mark new util type functions as @hide in AOSP.
This commit is contained in: