Merge "DO NOT MERGE: Notify test thread only after the callback thread has updated internal stats." into android12L-tests-dev