Merge "[automerger skipped] Merge "New shortcodes to safelist (Q2 2020)" into...

Merge "[automerger skipped] Merge "New shortcodes to safelist (Q2 2020)" into rvc-dev am: 4992fd11 am: c768e58e am: 87b83513 -s ours" into rvc-qpr-dev-plus-aosp am: d2f006ab -s ours

am skip reason: Change-Id I4b1b0337a9d3531d74d3e5a31ea246a80ac1c280 with SHA-1 e6bf432d is in history

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

Change-Id: I026c12602f17e2276644a42b72d9fce34f02e45b