Merge "PackageManager flags should not exist when sensors are empty" into stage-aosp-sc-ts-dev