Merge "Fix static lib collision between system_server + framework" am: a6f4bbd4

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



Change-Id: I00e1ae911b097b894083f9ba55a9ad3c45fb797e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>