[automerger skipped] Merge "Show letterbox rounded corners behind navbar" into...

[automerger skipped] Merge "Show letterbox rounded corners behind navbar" into tm-qpr-dev am: 6f20d51b am: b1491547 -s ours

am skip reason: Merged-In I133a6bfc79cdb90f9a04f9c52286cf205dae1fb9 with SHA-1 119338b0 is already in history

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



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