Merge "Redefine android-non-updatable.stubs.* modules definition" am:...

Merge "Redefine android-non-updatable.stubs.* modules definition" am: d8c3586c am: c20a4de3 am: 7f04fe49

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



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