am 080671c5: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP.

* commit '080671c5383f4b98303c143a685b9f5e75cfe781':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.