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

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

Change-Id: I9d7b3b14357d4a2db3d18bbc61a4b10c986a3634