Merge "Wait for ACTION_MEDIA_MOUNTED before removing started users." into...

Merge "Wait for ACTION_MEDIA_MOUNTED before removing started users." into tm-dev am: f171d009 am: 4c931f54 am: eddab6e6 am: 3c5436a9

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



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