Add to/from disk stable format am: 1e3c0ae6

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



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