Merge "Snap for 6948038 from d682228ae76ad10084b57b94a3d4ac8d91898958 to rvc-platform-release am: 49c57f126f" into android11-gsi