[automerger skipped] Merge "remove hidden APIs in ResolveInfo, ComponentInfo...
[automerger skipped] Merge "remove hidden APIs in ResolveInfo, ComponentInfo and Bundle" am: 3c533928 am: dee384c9
am: 870b42f0 -s ours
am skip reason: change_id I3a292af12ffcfa1ad996cf17747fa2ffd45e995c with SHA1 614b95ab is in history
Change-Id: I4894e7d59d3c7479267948f85708bd168ca531b5