[automerger skipped] Merge "BgDexopt: Reschedule job on timeout" into pi-dev
am: f0edf03eda  -s ours

Change-Id: Iebb0cbab80791fa15a2e40049ec8b6f40441d5be