Merge "Directly use packageInfoLiveData value in PermStateLiveData" into mainline-prod