Merge "Don't start test apps if not necessary." into sc-dev am: 8fe052717b am: 30bfd02eae

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/14641390

Change-Id: I4579ed4aa6c09f73796a892c9af74ab39e259d4b