Merge "Track the correct package manager field" into sc-dev am: c0868db9 am:...

Merge "Track the correct package manager field" into sc-dev am: c0868db9 am: b7246a75 am: eda84eb4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14796353

Change-Id: I0b0ba8ffc25fd883e7b7f338b14b7c90872869f3