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