Merge changes from topic "canwrite" into rvc-dev am: f31fb74bef

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

Change-Id: I62c56b5942286774ba992b708380b908deccb563