odrefresh: fixes for launching from init am: 8f19867228

Original change: https://android-review.googlesource.com/c/platform/art/+/1611674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e4584fa90b60d781e6fae9c11889aaec6aaf0f7