Merge "Keep track of the WCT changes to determine the transition type" into tm-qpr-dev am: 3dd646cf20 am: a08ba96797

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

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