Merge "Merge cherrypicks of [16566268, 19085842] into rvc-platform-release. am: 0b7589e6d4" into android11-gsi