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