am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."
* commit 'f5294ed57cf388973a1db29b062b1577966f90d1': DO NOT MERGE: Mark new util type functions as @hide in AOSP.
This commit is contained in: