Merge "remove hidden APIs in ResolveInfoa nd ComponentInfo"
am: d23bf23944

Change-Id: Ifeee29a7caeb09e036b784137eb5bbe2fd2e9863