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: 594239d7 am: 5652b1b1

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



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