[automerger skipped] Merge "Further fixes on...

[automerger skipped] Merge "Further fixes on VIMS.onPreCreatedUserConversion()" into tm-qpr-dev am: 9790553c am: fecd4333 -s ours

am skip reason: Merged-In Id933b2bc4f887da8b2f4959955bd174ed5879a47 with SHA-1 63da68c1 is already in history

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



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