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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6747d8a5e2341338d3e0f71692876bf183609b3a