Merge "Minor updates" into tm-mainline-prod am: 18cf25873e am: 25f182249c am: 13b0236196

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

Change-Id: I515ef8b407a295d63cb12cf1dbe586df68553484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>