Merge "Merge cherrypicks of [15806296] into rvc-platform-release. am: 258dd6e27e" into android11-gsi