Merge "Merge cherrypicks of [19536772] into rvc-platform-release. am: b9e1064c33" into android11-gsi