Merge "FRR follow-up: change the data directory" into udc-qpr-dev am: 84bdf480 am: dffe5f05

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



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