Merge "Add /apex to the list of allowed SystemServer paths" into rvc-dev am: 55815db140 am: 751c69b1c1

Change-Id: Ic3aee4ffbb212abf83034baa348b4f123ab74278