[automerger skipped] Merge "New shortcodes to safelist (Q2 2020)" into rvc-dev am: 4992fd1120 -s ours

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

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

Change-Id: I863199164a2a25c46b2b7e7a4c372832005d3bc6