Merge "Add annotation for hidden members used by apps."
am: 78368234b2

Change-Id: I36473b64f55c96f1ea0b42080b8ff7c229180840