Merge "aconfig: update storage unit test case" into main am: 01fca987 am:...

Merge "aconfig: update storage unit test case" into main am: 01fca987 am: 9387ba09 am: 3781c5bf

Original change: https://android-review.googlesource.com/c/platform/build/+/2898260



Change-Id: Ia82072f654a7fca88e58496fd63d0e9e796a6ca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>