Merge "Snap for 6948038 from ecfc03d614a04431b1a92e920f3591ca5bb85009 to rvc-platform-release am: e8aa8ae144" into android11-gsi