Merge "Reset letterboxVerticalPositionMultiplier with adb" into udc-qpr-dev am: f0596b828d am: 147f15a6bc

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

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