Android R Beta 3
Snap for 6318458 from 064e3517fbe68e5329ce5ecd3ae8374b397bf234 to rvc-release

Change-Id: If0f8d2a75e86c99f52e6ce29e102af57db0ddd0e