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

Change-Id: I4732ceb1392d78464d418a9bfc0bcd073550b94f