Merge "Cleaned up transaction sanitize calls" into udc-dev am: eb7596b8 am: e2ba12e4

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



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