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

Merge "Rename to match internal storage format." into main am: 778002bd am: 05757a85 am: 10fbadbd

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



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