Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754

Change-Id: I53f4749b3990dd24a71b9d842c7b8f1535caac9e