Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
am: 41f1ef8c02  -s ours

Change-Id: Icf296e0f93486f2ab9c9a1bdd6e8274b58341809