Merge "Removing ACTION_CLEAR_PACKAGE intent" into oc-dev
am: ef08871d6b

Change-Id: Ib173b22981d9081c184b024d54671729ec081d11