Android R Beta 2
Merge "Add METADATA to chromium-trace: contains GPL=RESTRICTED" am: fc2ec850fa

Change-Id: Ic88936effea6893fd90bbfdd22f5ed3ce5bb2405