Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev
am: 130d850614

Change-Id: Ie5848073bb6462166ad0c09c84d9a95ac4dbe26a