Merge "storaged: skip disk_stats test if not supported." am: c232e0af05 am: 43373678d9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1912710

Change-Id: I14a1940f15f4ba17d7566251b476d72c5b43fa45