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

Change-Id: Ic0d7cb81330fe876c257d198e805d7e20a1e22e1