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

Change-Id: Ie47cd2521aa4d21fc2dce3a57d6eff28b1d03f7a