master
Improve tracing (#93086)
Reland "Update template/test `compileSdk`, `targetSdk`, `ndk` versions" (#153795)