Android 12.1.0 release 16
Snap for 7989966 from ff548389b6d1ca30a36b6561c12e9b7469fb7bc7 to sc-d2-release

Change-Id: I6315dd58dd1327f3b984a401b05c84134293302b