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