Merge "Rename to match internal storage format." into main am: 778002bde8

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

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