Merge "Add platform certificate to Notes Role enable RRO" into udc-dev am:...

Merge "Add platform certificate to Notes Role enable RRO" into udc-dev am: 96832029 am: c5189e75

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



Change-Id: I0b525eafa9dd03614cc3b21d6c90349601754dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>