Merge "remove hidden APIs in ResolveInfoa nd ComponentInfo"