Merge "Call ActivityManager to request activity relaunch" into oc-dev
am: 748405a0f5

Change-Id: I2780805663b223d82b1b7d3582ae5850c30c7b7d