Merge "Rebase enabled overlays for every PackageParser.generateActivityInfo() call" into oc-dev
am: ad724f61ad

Change-Id: I396870c82c6cdb1e4b709ff17cc1de4f62492a0a