Merge "CTS test for Android Security b/370477460" into main