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

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

Change-Id: Ie2f918518ca442e9beb739e4ba70248a75fbce5b