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 am: e1a56179

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



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