Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 0e4d7f14 am: 3d45ca98

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186630

Change-Id: I515a1d671ffd1324b5b15607cc42d4753361dd32