Merge "Move PersistentDataBlock* in server to its namespace" into main am: 0ac140858e am: 0e61ff6a78

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

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