Merge "init.rc: set up init.rc for aconfigd to initialize mainline storage" into main