Merge "Restore security context of `/postinstall/apex` earlier in otapreopt_chroot." am: d1569ad004 am: c4545c517c
am: 9eb63ee51e

Change-Id: I92dd3ac5af1054c40e0fb46bbdef8c1858f8109a