Android R Beta 2
Merge "Set apex_available property" am: 678fe9907b

Change-Id: If2a6cb5bee3e0ffcf31705568da30bd5b27b935f