Merge "Replace test_min_api_level with test_options.min_shipping_api_level" am: 3589db8c3c am: ff5182de81

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1905070

Change-Id: Id4f62ae767e4507dcea8a0c7842937b696027139