Merge "Merge cherrypicks of [17614692] into rvc-platform-release. am: ce02568a14" into android11-gsi