Android 11.0.0 Release 20 (RQ1A.201205.010)
[automerger skipped] Makefile change to allow VTS testing am: b9f27bbdad am: a15aee3613 am: c8ca2de7e4 -s ours
am skip reason: Change-Id I1b2dd68825af80095faf39aa7ebe0cfa0355f0ff with SHA-1 48e934fc53 is in history

Change-Id: Ie0f7698817d6101f77d790973aa35e25809cb740