Merge "Use PackageManager.FEATURE_CONTROLS to decide availability" into rvc-dev am: 43527ef8f4
am: 1555ccbf23
Original change: undetermined Change-Id: Ie8b3cb764e776ecb70cd13e6e68217fc119c4dc2
This commit is contained in: