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

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



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