Android CTS 9.0 Release 20 (8503603)
Merge cherrypicks of [2063832] into sparse-8444721-L68600000954263557.

Change-Id: I306e3b04acbee8b1b999eb5062c4987bf123af4b