Merge changes from topic "Tiramisu-SDK-Finalization-revert-hack" into tm-dev am: 120aa88d am: 801d350f am: b7b27b00 am: a2a0f1c3

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



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