tree 0503c5dd25533e9fb2b742be8dc061f3f867e8bb
parent 555066ebad3ebcc684d98004418ba014a1e1aa02
parent 6672d870e5890eac5fba64c645babfb06eeb7de2
author wilsonshih <wilsonshih@google.com> 1562093014 -0700
committer android-build-merger <android-build-merger@google.com> 1562093014 -0700

[automerger skipped] Prevent system server crash while start activity failed. am: 380626cf54 am: a6be7c3d44
am: 6672d870e5 -s ours
am skip reason: change_id I7949dc1effcc171834f6bc3ff0333f9090b58480 with SHA1 0c0fb22eab is in history

Change-Id: Iad915dee3f0918aae33ce4b22ec891c7d1b14305