Android 12.1.0 release 16
Snap for 7401515 from 8c79c498686952c108943422bd01c1924f4f8346 to sc-d2-release

Change-Id: I874878d7b2c8cc7f0e625fbacc0d9b54802e9e62