Merge "Use local status for convert profile" am: 7aab6bbe3d am: b9b3f78f04 am: 1e239a8a4d am: 44e565c255

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

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