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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d1e42ed49e7a4c7d5f22e36a67a8a811dc42162