Merge "init: don't import rc files during mount_all after Q"
am: cbe0876f8b

Change-Id: I69545029a7743aad1e76ca1804002d8556fd436e