Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev