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