Merge "Activate apexes in /system_ext/apex, /vendor/apex" am: 5f28d3c732 am: c40bba08ac am: 2ac83618ca

Change-Id: I43bc1e1783f764165a06f20bce8b38d46a87e657