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

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

Change-Id: Ia4926c922cd1663690f118b7fa996787fc995b08