Add to/from disk stable format am: 823599b4a8 am: 2e5b004421 am: 7f201bc8b5 am: 5f1d82189c

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

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