Merge "Snap for 6948038 from f3c81c588e48aed82f883f7ea71a4cd2d1de5f9a to rvc-platform-release am: 1acb1a383f" into android11-gsi