Merge "Fix issue with saving protos to disk during shutdown." into rvc-qpr-dev am: 0943ebe36d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40be559cdb840da61cb008a849e9807c9475363b