Android VTS 11.0 Release 8 (8478917)
Snap for 6484097 from db2286a7c4107fb834e23951c229f13616435a93 to rvc-release

Change-Id: Iefcc1ae87bbfc5875ece9391855d5e93e0d309c6