Android Platform 11.0.0 Release 37 (11124701)
Merge cherrypicks of [17034411] into rvc-platform-release.

Change-Id: Ieba040f43d43dcbc5ada06674af5d6874712d3aa