Merge "Fix LetterboxConfigurationPersisterTest when file is deleted" into udc-qpr-dev am: 985b432d58

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

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