Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev...

Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d am: 4226e4b4 am: aed3061f am: bd1e5cd3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18764290



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