Merge "Merge cherrypicks of [15975347, 15975348, 15975349, 16508592, 16508593, 16508594, 18029504] into rvc-platform-release. am: 95af48052c" into android11-gsi