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

Change-Id: Ic54930957e7d34075bde0a42a6b875f8f4c49cb9