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

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



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