Merge "Fix issue #65259946: APR: runtime restart: at com.android.server.am.ActivityManagerService" into oc-mr1-dev