Android 12.1.0 Release 5 (SP2A.220505.002)
Merge cherrypicks of [17116700] into sc-v2-release.

Change-Id: I04e3af7a595971d319673d11e33fc35d82a85946