Merge "Fix system_server's main thread name." am: 7fa0e63bc3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06c78cb351f3fed294c28e664e9d337ff97de1fd