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: Ic0f667212228d73bc6c3f14be42b3c9db97cfe42