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

Merge "Fix static lib collision between system_server + framework" am: a6f4bbd4 am: e9c76893 am: 84960032 am: 2974e295

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



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