Merge "Fix for testAPostBootOptimizationCancelled" into android13-tests-dev