Merge "Special handling of priv-apps in PMS."
am: 107899c599

Change-Id: I43de972b520dcfab7d103ce77ea1539e341825b3