Merge "Fix issue with saving protos to disk during shutdown." am: 68e0de029a

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

Change-Id: Ic7b04f9f0be8c0552cefaf58d57c914e9386b57a