Android CTS 8.1 Release 6 (4799944)
Merge cherrypicks of [3120219, 3121602, 3124243, 3125180] into oc-mr1-release

Change-Id: I0e105cd329ee5aa49ff3981aa5cb793dee02ddc7