Merge "Add CddTest annotation for 3.1/C-0-8" into udc-dev am: f6b67dc5 am: 913d3b76

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



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