Merge "Make sure the mixedtransition record is removed" into udc-dev am: 989a0778

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



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