Merge "Remove more thin wrappers from the shared lib" into tm-qpr-dev am: de2e7c43

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



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