[automerger skipped] Merge "Fixed VIMS to postpone ASSISTANT rule change on...

[automerger skipped] Merge "Fixed VIMS to postpone ASSISTANT rule change on pre-created users." into tm-qpr-dev am: 9e9bd1e4 am: c7e39d86 -s ours

am skip reason: Merged-In I12d9bb32e144ecf91ee4b452affea0dcea546127 with SHA-1 39acca1d is already in history

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



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