Merge "Use PackageManager.FEATURE_CONTROLS to decide availability" into rvc-dev am: 43527ef8f4 am: 5a91550b9d am: 202d588676 am: 152054a522
Original change: undetermined Change-Id: I86df71f5183c086208c1ecdf66cd962ba27a964c
This commit is contained in: