Merge "VCN: Remove hidden APIs for data directory and Settings constants" into main am: 5c75a96448

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

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