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

Change-Id: If70d3c2e3b2e51aa4e41f88c4623692a40fa052a