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

Change-Id: I2faffd66d1ab5629edece991ed6566c0541d8a3a