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: 2d7301d2 am: fcb59b8f am: b863bb70 am: 92e6ff39

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

Change-Id: Ia9093e5ded44b149277382f368140d11f676f2f5