PackageManager side of the change. bug:37929796 Test: build (cherry picked from commit 56123bac) Change-Id: I3a789d49121ca383f7931f3803b6140be456340f