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

Change-Id: I8a7ca905e5be0b6403e2bb617d20dfd9f888af86