Merge "Merge cherrypicks of [16230693, 16406360] into rvc-platform-release. am: 48fe53cdf2" into android11-gsi