[automerger skipped] Merge "Remove more thin wrappers from the shared lib"...

[automerger skipped] Merge "Remove more thin wrappers from the shared lib" into tm-qpr-dev am: de2e7c43 am: 6ed85c9a -s ours

am skip reason: Merged-In I1532f1b853765fb69c5bf46ad5a08230bde00c5f with SHA-1 a62cb21b is already in history

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



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