Add to/from disk stable format am: 823599b4 am: 2e5b0044 am: 7f201bc8...

Add to/from disk stable format am: 823599b4 am: 2e5b0044 am: 7f201bc8 am: 5f1d8218 am: 884ba583

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



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