Merge "[1/n] FRR data capture" into udc-qpr-dev am: 811b771207 am: c7b7bb2796

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

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