Merge "Snap for 6869500 from abd55cbbe6b665b956ebcd3795620f8f18f72423 to rvc-platform-release am: 1d082db7e5" into android11-gsi