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

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



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