Merge "Merge "Fix CTS test failure caused by the backporting of the BAL security fix." into android12-tests-dev am: e7f36e6899" into android12L-tests-dev