Merge "New shortcodes to safelist (Q2 2020)" into rvc-dev am: 4992fd1120

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

Change-Id: Ifa94e3f9c45b84724192927f6f76330b7feacd66