Merge "Make the new RoR atoms compile" am: c70e8913a2 am: e16f153d11 am: 4910f14d0c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I261f0fd1cb7d7bac2774450ee02668664490ce41