Merge "Stop calling super.<> methods which are empty am: ede3065252 am: 1a0f746be6 am: 2e821e5a2d" into tm-d1-dev-plus-aosp am: acb6f8ae4a

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/18873482

Change-Id: Iccd3ef9cd622367c385e2c6fd3ad734ba2b777bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>