Merge "Clone profile badge resolution in settings." into udc-dev am: f45ad6f5 am: 07a16577

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



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