Merge "Temporarily allow otapreopt_chroot to query ro.cold_boot_done prop"