Merge "Merge "Add concept of implicitly exposed components" into oc-dev am: 0a4b7f5a86" into oc-dev-plus-aosp
am: eeb311e47d

Change-Id: I3857f3d588497024caab36d6a3a11f9374018c78