Merge "Prioritze package installer intent filter am: f1fb59a1 am: 1c2b3518...

Merge "Prioritze package installer intent filter am: f1fb59a1 am: 1c2b3518 am: db7e6faf  -s ours am: b48336da am: 31429af6 am: 5dc4dbe8 am: 328c39b7 am: 1074cc15 am: c9706496 am: 9be01373 am: 4d6c0c19 am: 4c2a2a37" into nyc-mr2-dev-plus-aosp
am: d6f3b0ae

Change-Id: I844a129bce303ae3d9cd879ca1655503025625a3