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