Merge "Replace stubs with library references" into tm-qpr-dev am: d5e597c0

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



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