Merge cherrypicks of [5054143, 5054520] into qt-release

Change-Id: I90d6d2a153a5e38a5c4235fb335a39e24ec937c1

cmds/installd/otapreopt_script.sh

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@

		# This script will run as a postinstall step to drive otapreopt.

		# Temporarily disable for b/115853663.
		exit 0

		TARGET_SLOT="$1"
		STATUS_FD="$2"