Merge "Don't preopt system server apps in system_other." into oc-dev
am: 41547f5de4

Change-Id: I03ac6d0b507371e5a8ef3d58d84394e22d1b1754