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

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

Change-Id: I7c1b3a9ebb2a8cf9dd64ec05f70450442cc83fcd