[automerger skipped] Use local status for convert profile am: cefd74bb6e -s ours am: 6828b64259 -s ours
am skip reason: Merged-In Ifd2bd3cb2b2252c08055c95375fe499e3f23ce02 with SHA-1 4469c2a063 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19999744
Change-Id: If4e360a344e5fb0be0dd64d93e2bcda1e04dbb98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: