MP targets 31 (except in master) am: d42c38e9cc

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

Change-Id: I43be58cd25faa8b05441ac3cae5b49b23837c25a