Add to/from disk stable format am: 823599b4a8 am: 2e5b004421

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

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