After maybeRequestReadExternalStoragePermission and the
subsequent granting of the permission, the media source
would never be created.
I can't see a case where initializePlayer shouldn't create
a new MediaSource, so I've just removed the condition.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164260074
The manifest value is always overridden in gradle builds,
so this is for internal builds only. The value should be
the same (i.e. 25!).
Also fix IMA build to force the right support library
version, attempt 2!
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164103183