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

Change-Id: I74f81a69797ca04883e12dc17f9e56bdbf918881