Merge "Replace test_min_api_level with test_options.min_shipping_api_level"...

Merge "Replace test_min_api_level with test_options.min_shipping_api_level" am: 3589db8c am: ff5182de am: c39483dd am: 08803d08

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

Change-Id: I1758651160c2765b9f74fbd4b3a2c88d3a5b2bea