Merge "clang-format com_android_server_pdb_PersistentDataBlockService.cpp" into main