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

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

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