Merge "Make the new RoR atoms compile" am: c70e8913a2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc2a3248daedfb72664f25c2bb339f284ff01a7c