Merge "Merge cherrypicks of [18589711, 19785208, 19950285, 20123964, 20211484, 20226237, 20030687, 20248332, 20235229, 20105226, 20210471, 20256127, 20192647, 20219552] into rvc-platform-release. am: d6590190cd" into android11-gsi