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

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



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