[automerger skipped] Merge "Use local status for convert profile" into...

[automerger skipped] Merge "Use local status for convert profile" into tm-qpr-dev am: 5c312d7f -s ours am: 6b0fa33f -s ours

am skip reason: Merged-In Ifd2bd3cb2b2252c08055c95375fe499e3f23ce02 with SHA-1 4469c2a0 is already in history

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



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