Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf

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

Change-Id: I89ea760ec38328347a7946d17f352438ac3341c9