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

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

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