Android 11.0.0 Release 36 (RQ2A.210505.002)
Merge cherrypicks of [14036643] into rvc-qpr2-release

Change-Id: I99e0c1e50e9acb6eaff76cbd72d013365bb15fa3