Merge "Annotate two non-SDK methods known to be used by apps"
am: de441278e7

Change-Id: I66ec979de4ce5731b144cf5173a0a715d1e8f231