[automerger skipped] Merge "Call ActivityManagerService.enterSafeMode" am: 97fc7d6bf6 -s ours am: df024fdffc -s ours
am: cf9af32624 -s ours
am skip reason: change_id Ie2caf6d2fd74b241927a245393fb31658201962f with SHA1 876a733e71 is in history

Change-Id: Ia710542e10e55bc5ea204f02bebc64660f20e1d6