Merge "Ensure candidate phase logged in split branch" into udc-dev am: d3a95bbc am: b65db243

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



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