[automerger skipped] Merge "Move PersistentDataBlock* in server to its...

[automerger skipped] Merge "Move PersistentDataBlock* in server to its namespace" into main am: 0ac14085 am: 0e61ff6a am: 711471ed am: 8fd0356a -s ours

am skip reason: skipped by user victorhsieh

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



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