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

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

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



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