Merge 2022-02 release branch to tip of android12-5.10 Change-Id: I1771db32802d779455613ba3421f10344586f055