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

Change-Id: I9a7f3161d441f568d4647f3b93be0d367087ed1d