Merge "Merge "Allow apps in /odm/app and /odm/priv-app (2/2)" into pi-dev am:...
Merge "Merge "Allow apps in /odm/app and /odm/priv-app (2/2)" into pi-dev am: cb7b04a5" into pi-dev-plus-aosp
am: 35ae7d44
Change-Id: Id008488baf437be4ea82dfcadccfbf2e4b385790