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

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

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