Merge "Fix for testDaveyDrawFrame" into android12-tests-dev