Merge "Avoid reading device config before Android S device version" into sc-dev am: da2ba2e61f

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

Change-Id: Ief8ef99a3ebdbc41004da97569e99d021bdc5b45