[automerger skipped] Merge "remove hidden APIs in ResolveInfoa nd ComponentInfo" am: d23bf23944 am: d527c683bb am: a4bd4de5e4 -s ours
am skip reason: Change-Id I8f0fb43e266bb7ba1d7478a450d4433ee3c8d1be with SHA-1 cbcd91f02e is in history

Change-Id: Id725fa29b53a312ebd2cdb3595c77098bf55b63c