Merge "Don't preopt system server apps in system_other."
am: f53ebefae3

Change-Id: I09f7b0e690871271349073edab59250721eb88e0