Android platform 11.0.0 release 33
Merge cherrypicks of [17034411] into rvc-platform-release.

Change-Id: Ieba040f43d43dcbc5ada06674af5d6874712d3aa